Merge git://git.denx.de/u-boot-dm
authorTom Rini <[email protected]>
Fri, 29 Jan 2016 18:47:38 +0000 (13:47 -0500)
committerTom Rini <[email protected]>
Fri, 29 Jan 2016 18:47:38 +0000 (13:47 -0500)

Trivial merge